<<<<<<< HEAD
package edu.stu.cs.software.family.warehouse.web.spring.controller;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import edu.stu.cs.software.family.base.web.spring.controller.GenericController;
import edu.stu.cs.software.family.warehouse.domain.Product;
import edu.stu.cs.software.family.warehouse.service.ProductManager;


@RestController
@RequestMapping(value = "/product")
public class ProductController extends GenericController<Product, Long, ProductManager> {

	ProductManager productManager;

	@Autowired
	public void setProductManager(ProductManager productManager) {
		this.productManager = productManager;
		this.manager=this.productManager;
	}
	
	
	
}
=======
package edu.stu.cs.software.family.warehouse.web.spring.controller;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import edu.stu.cs.software.family.base.web.spring.controller.GenericController;
import edu.stu.cs.software.family.warehouse.domain.Product;
import edu.stu.cs.software.family.warehouse.service.ProductManager;


@RestController
@RequestMapping(value = "/product")
public class ProductController extends GenericController<Product, Long, ProductManager> {

	ProductManager productManager;

	@Autowired
	public void setProductManager(ProductManager productManager) {
		this.productManager = productManager;
		this.manager=this.productManager;
	}
	
	
	
}
>>>>>>> origin/master
